<!DOCTYPE html>
<html lang="en-US">
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width,initial-scale=1">
    <title>Git分支-变基 | Vscing blog</title>
    <meta name="generator" content="VuePress 1.8.0">
    <link rel="icon" href="/img/favicon.ico">
    <script data-ad-client="ca-pub-7828333725993554" async="async" src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
    <meta name="description" content="全栈技术博客,简洁至上,专注学习与总结。JavaScript,js,ES6,TypeScript,vue,react,php,java,python,css3,html5,Node,git,github等技术文章。">
    <meta name="keywords" content="前端博客,个人技术博客,前端,前端开发,前端框架,web前端,前端面试题,技术文档,学习,面试,JavaScript,js,ES6,TypeScript,vue,python,css3,html5,Node,git,github,markdown">
    <meta name="baidu-site-verification" content="7F55weZDDc">
    <meta name="theme-color" content="#11a8cd">
    <link rel="preload" href="/assets/css/0.styles.46195d5d.css" as="style"><link rel="preload" href="/assets/js/app.c1850502.js" as="script"><link rel="preload" href="/assets/js/2.d72a94c1.js" as="script"><link rel="preload" href="/assets/js/129.bd944054.js" as="script"><link rel="prefetch" href="/assets/js/10.3a4a01f4.js"><link rel="prefetch" href="/assets/js/100.cafccb02.js"><link rel="prefetch" href="/assets/js/101.9b90a2cb.js"><link rel="prefetch" href="/assets/js/102.57fa6dba.js"><link rel="prefetch" href="/assets/js/103.5fb70a87.js"><link rel="prefetch" href="/assets/js/104.19ff8124.js"><link rel="prefetch" href="/assets/js/105.bc3af5a9.js"><link rel="prefetch" href="/assets/js/106.e0b0d025.js"><link rel="prefetch" href="/assets/js/107.36be26d8.js"><link rel="prefetch" href="/assets/js/108.3fd2dad6.js"><link rel="prefetch" href="/assets/js/109.370822fd.js"><link rel="prefetch" href="/assets/js/11.ef14dc03.js"><link rel="prefetch" href="/assets/js/110.24ef06ab.js"><link rel="prefetch" href="/assets/js/111.316bf6d9.js"><link rel="prefetch" href="/assets/js/112.688666c2.js"><link rel="prefetch" href="/assets/js/113.72645a7e.js"><link rel="prefetch" href="/assets/js/114.b84a416b.js"><link rel="prefetch" href="/assets/js/115.b1f2686d.js"><link rel="prefetch" href="/assets/js/116.ffe1956f.js"><link rel="prefetch" href="/assets/js/117.3ac55c28.js"><link rel="prefetch" href="/assets/js/118.0e9580bd.js"><link rel="prefetch" href="/assets/js/119.3a66e144.js"><link rel="prefetch" href="/assets/js/12.50962377.js"><link rel="prefetch" href="/assets/js/120.15241f2a.js"><link rel="prefetch" href="/assets/js/121.1a557cf9.js"><link rel="prefetch" href="/assets/js/122.f49fe0c6.js"><link rel="prefetch" href="/assets/js/123.63b0dab8.js"><link rel="prefetch" href="/assets/js/124.64e10cf6.js"><link rel="prefetch" href="/assets/js/125.ac1a45a2.js"><link rel="prefetch" href="/assets/js/126.4101e5bc.js"><link rel="prefetch" href="/assets/js/127.84af1857.js"><link rel="prefetch" href="/assets/js/128.78881e2c.js"><link rel="prefetch" href="/assets/js/13.81d41325.js"><link rel="prefetch" href="/assets/js/130.b7ae5476.js"><link rel="prefetch" href="/assets/js/131.42fdd237.js"><link rel="prefetch" href="/assets/js/132.0acb8329.js"><link rel="prefetch" href="/assets/js/133.30f095ac.js"><link rel="prefetch" href="/assets/js/134.af37ce64.js"><link rel="prefetch" href="/assets/js/135.8fda9d65.js"><link rel="prefetch" href="/assets/js/136.5043bc0c.js"><link rel="prefetch" href="/assets/js/137.67f7560b.js"><link rel="prefetch" href="/assets/js/138.1cee76c9.js"><link rel="prefetch" href="/assets/js/139.c0a8e214.js"><link rel="prefetch" href="/assets/js/14.c8be704a.js"><link rel="prefetch" href="/assets/js/140.cae55178.js"><link rel="prefetch" href="/assets/js/141.d1bb8b1d.js"><link rel="prefetch" href="/assets/js/142.98109a54.js"><link rel="prefetch" href="/assets/js/143.4ed1f39b.js"><link rel="prefetch" href="/assets/js/144.4082f638.js"><link rel="prefetch" href="/assets/js/145.9c95501d.js"><link rel="prefetch" href="/assets/js/146.b18f56cb.js"><link rel="prefetch" href="/assets/js/147.003567b4.js"><link rel="prefetch" href="/assets/js/148.17166202.js"><link rel="prefetch" href="/assets/js/149.a254b64b.js"><link rel="prefetch" href="/assets/js/15.e931f5ae.js"><link rel="prefetch" href="/assets/js/150.b14364a6.js"><link rel="prefetch" href="/assets/js/151.0c74502f.js"><link rel="prefetch" href="/assets/js/152.a464e076.js"><link rel="prefetch" href="/assets/js/153.82d664a9.js"><link rel="prefetch" href="/assets/js/154.29330d51.js"><link rel="prefetch" href="/assets/js/155.ac97d1dc.js"><link rel="prefetch" href="/assets/js/156.9a09aae3.js"><link rel="prefetch" href="/assets/js/157.bc343d60.js"><link rel="prefetch" href="/assets/js/158.a0e2fabc.js"><link rel="prefetch" href="/assets/js/159.86c09a04.js"><link rel="prefetch" href="/assets/js/16.70de468e.js"><link rel="prefetch" href="/assets/js/160.bede104b.js"><link rel="prefetch" href="/assets/js/161.59152d71.js"><link rel="prefetch" href="/assets/js/162.4da753d9.js"><link rel="prefetch" href="/assets/js/163.85130c2e.js"><link rel="prefetch" href="/assets/js/164.73af69a5.js"><link rel="prefetch" href="/assets/js/165.5eb91d7c.js"><link rel="prefetch" href="/assets/js/166.d673b37e.js"><link rel="prefetch" href="/assets/js/167.566e26dc.js"><link rel="prefetch" href="/assets/js/168.e23aa1de.js"><link rel="prefetch" href="/assets/js/169.7e94ecf2.js"><link rel="prefetch" href="/assets/js/17.0634fe99.js"><link rel="prefetch" href="/assets/js/170.71d9b108.js"><link rel="prefetch" href="/assets/js/171.62dbc9c0.js"><link rel="prefetch" href="/assets/js/172.58992686.js"><link rel="prefetch" href="/assets/js/173.b80c65de.js"><link rel="prefetch" href="/assets/js/174.42d3711c.js"><link rel="prefetch" href="/assets/js/175.cbf7a8cf.js"><link rel="prefetch" href="/assets/js/176.6a466f29.js"><link rel="prefetch" href="/assets/js/177.48b2b1ac.js"><link rel="prefetch" href="/assets/js/178.67041227.js"><link rel="prefetch" href="/assets/js/179.2b1142da.js"><link rel="prefetch" href="/assets/js/18.6c75b434.js"><link rel="prefetch" href="/assets/js/180.15dc4275.js"><link rel="prefetch" href="/assets/js/181.6256c092.js"><link rel="prefetch" href="/assets/js/182.e29547c6.js"><link rel="prefetch" href="/assets/js/183.239c5d71.js"><link rel="prefetch" href="/assets/js/184.40224921.js"><link rel="prefetch" href="/assets/js/185.1d685ce2.js"><link rel="prefetch" href="/assets/js/186.fd402562.js"><link rel="prefetch" href="/assets/js/187.44316d8a.js"><link rel="prefetch" href="/assets/js/188.d9bcc786.js"><link rel="prefetch" href="/assets/js/189.6b75bc96.js"><link rel="prefetch" href="/assets/js/19.5f0275cc.js"><link rel="prefetch" href="/assets/js/190.170a5ab0.js"><link rel="prefetch" href="/assets/js/191.0e3c027e.js"><link rel="prefetch" href="/assets/js/192.43a1b721.js"><link rel="prefetch" href="/assets/js/193.0bbdc1f7.js"><link rel="prefetch" href="/assets/js/194.8c778e77.js"><link rel="prefetch" href="/assets/js/195.83a52c06.js"><link rel="prefetch" href="/assets/js/196.9bcf184d.js"><link rel="prefetch" href="/assets/js/197.895d4707.js"><link rel="prefetch" href="/assets/js/198.ff4b00e7.js"><link rel="prefetch" href="/assets/js/199.914ae724.js"><link rel="prefetch" href="/assets/js/20.edf47839.js"><link rel="prefetch" href="/assets/js/200.572a57be.js"><link rel="prefetch" href="/assets/js/201.1e92dfb4.js"><link rel="prefetch" href="/assets/js/202.4fb01755.js"><link rel="prefetch" href="/assets/js/203.77669f1e.js"><link rel="prefetch" href="/assets/js/204.9b708571.js"><link rel="prefetch" href="/assets/js/205.c88c135c.js"><link rel="prefetch" href="/assets/js/206.4a961f68.js"><link rel="prefetch" href="/assets/js/207.e819be78.js"><link rel="prefetch" href="/assets/js/208.3ed91f43.js"><link rel="prefetch" href="/assets/js/209.8d76f011.js"><link rel="prefetch" href="/assets/js/21.9728b3ab.js"><link rel="prefetch" href="/assets/js/210.be71a787.js"><link rel="prefetch" href="/assets/js/211.f19040aa.js"><link rel="prefetch" href="/assets/js/212.af0df23a.js"><link rel="prefetch" href="/assets/js/213.33354f52.js"><link rel="prefetch" href="/assets/js/214.e75e1acf.js"><link rel="prefetch" href="/assets/js/215.a19a02a3.js"><link rel="prefetch" href="/assets/js/216.71653524.js"><link rel="prefetch" href="/assets/js/217.5ce26938.js"><link rel="prefetch" href="/assets/js/218.448720a5.js"><link rel="prefetch" href="/assets/js/219.f83abe7d.js"><link rel="prefetch" href="/assets/js/22.d99e679f.js"><link rel="prefetch" href="/assets/js/220.f0a4e329.js"><link rel="prefetch" href="/assets/js/221.a63fac2b.js"><link rel="prefetch" href="/assets/js/222.da777628.js"><link rel="prefetch" href="/assets/js/223.67822249.js"><link rel="prefetch" href="/assets/js/224.fd036dca.js"><link rel="prefetch" href="/assets/js/225.4502b710.js"><link rel="prefetch" href="/assets/js/226.dbbe07cb.js"><link rel="prefetch" href="/assets/js/227.309c2613.js"><link rel="prefetch" href="/assets/js/228.52142c95.js"><link rel="prefetch" href="/assets/js/229.253b3c9e.js"><link rel="prefetch" href="/assets/js/23.3bdec03e.js"><link rel="prefetch" href="/assets/js/230.af200f20.js"><link rel="prefetch" href="/assets/js/231.546562b7.js"><link rel="prefetch" href="/assets/js/232.c5513027.js"><link rel="prefetch" href="/assets/js/233.af135e2e.js"><link rel="prefetch" href="/assets/js/234.4c73eb04.js"><link rel="prefetch" href="/assets/js/235.a9a106ea.js"><link rel="prefetch" href="/assets/js/24.31ba05b4.js"><link rel="prefetch" href="/assets/js/25.e632168f.js"><link rel="prefetch" href="/assets/js/26.8b4f4d1c.js"><link rel="prefetch" href="/assets/js/27.73a8af61.js"><link rel="prefetch" href="/assets/js/28.a399c713.js"><link rel="prefetch" href="/assets/js/29.6345822d.js"><link rel="prefetch" href="/assets/js/3.b1545b94.js"><link rel="prefetch" href="/assets/js/30.4121caf2.js"><link rel="prefetch" href="/assets/js/31.cbd0a371.js"><link rel="prefetch" href="/assets/js/32.bb21539c.js"><link rel="prefetch" href="/assets/js/33.d9ef9d4a.js"><link rel="prefetch" href="/assets/js/34.bb6b9736.js"><link rel="prefetch" href="/assets/js/35.94452a11.js"><link rel="prefetch" href="/assets/js/36.c8031063.js"><link rel="prefetch" href="/assets/js/37.c145085c.js"><link rel="prefetch" href="/assets/js/38.8331bc43.js"><link rel="prefetch" href="/assets/js/39.3d0f5775.js"><link rel="prefetch" href="/assets/js/4.97fba247.js"><link rel="prefetch" href="/assets/js/40.8645ffe4.js"><link rel="prefetch" href="/assets/js/41.ea893b5e.js"><link rel="prefetch" href="/assets/js/42.23b7fec4.js"><link rel="prefetch" href="/assets/js/43.1a1c127a.js"><link rel="prefetch" href="/assets/js/44.499e5e0c.js"><link rel="prefetch" href="/assets/js/45.a936fe60.js"><link rel="prefetch" href="/assets/js/46.dcc73915.js"><link rel="prefetch" href="/assets/js/47.8531f2e1.js"><link rel="prefetch" href="/assets/js/48.e252c07e.js"><link rel="prefetch" href="/assets/js/49.bee4b1fa.js"><link rel="prefetch" href="/assets/js/5.72ef969c.js"><link rel="prefetch" href="/assets/js/50.080d32c8.js"><link rel="prefetch" href="/assets/js/51.3fc7a83d.js"><link rel="prefetch" href="/assets/js/52.e1be9c1b.js"><link rel="prefetch" href="/assets/js/53.24e510ed.js"><link rel="prefetch" href="/assets/js/54.1437feec.js"><link rel="prefetch" href="/assets/js/55.4fbadf0b.js"><link rel="prefetch" href="/assets/js/56.27846469.js"><link rel="prefetch" href="/assets/js/57.d74c23a6.js"><link rel="prefetch" href="/assets/js/58.bcaabd2e.js"><link rel="prefetch" href="/assets/js/59.1a3cae63.js"><link rel="prefetch" href="/assets/js/6.32dc9888.js"><link rel="prefetch" href="/assets/js/60.12a88847.js"><link rel="prefetch" href="/assets/js/61.6a26c1ce.js"><link rel="prefetch" href="/assets/js/62.b72f7a5b.js"><link rel="prefetch" href="/assets/js/63.45c42fc9.js"><link rel="prefetch" href="/assets/js/64.c63229d3.js"><link rel="prefetch" href="/assets/js/65.b1a4efd0.js"><link rel="prefetch" href="/assets/js/66.67082c89.js"><link rel="prefetch" href="/assets/js/67.0be82011.js"><link rel="prefetch" href="/assets/js/68.ff51f357.js"><link rel="prefetch" href="/assets/js/69.a3622123.js"><link rel="prefetch" href="/assets/js/7.88750ad0.js"><link rel="prefetch" href="/assets/js/70.42b19a3b.js"><link rel="prefetch" href="/assets/js/71.abe211d6.js"><link rel="prefetch" href="/assets/js/72.323a0851.js"><link rel="prefetch" href="/assets/js/73.a8439952.js"><link rel="prefetch" href="/assets/js/74.3145a964.js"><link rel="prefetch" href="/assets/js/75.cf03bb3b.js"><link rel="prefetch" href="/assets/js/76.ac3371d2.js"><link rel="prefetch" href="/assets/js/77.3988c925.js"><link rel="prefetch" href="/assets/js/78.28866077.js"><link rel="prefetch" href="/assets/js/79.76ae67e2.js"><link rel="prefetch" href="/assets/js/8.861cc52f.js"><link rel="prefetch" href="/assets/js/80.674dc308.js"><link rel="prefetch" href="/assets/js/81.720c1a75.js"><link rel="prefetch" href="/assets/js/82.91ebd435.js"><link rel="prefetch" href="/assets/js/83.0c07c3ab.js"><link rel="prefetch" href="/assets/js/84.cfb08495.js"><link rel="prefetch" href="/assets/js/85.b3b98380.js"><link rel="prefetch" href="/assets/js/86.1a790c36.js"><link rel="prefetch" href="/assets/js/87.d547ea6d.js"><link rel="prefetch" href="/assets/js/88.30bb2ac8.js"><link rel="prefetch" href="/assets/js/89.60c26eff.js"><link rel="prefetch" href="/assets/js/9.8fef5bff.js"><link rel="prefetch" href="/assets/js/90.f91d0816.js"><link rel="prefetch" href="/assets/js/91.169fca7b.js"><link rel="prefetch" href="/assets/js/92.32efee35.js"><link rel="prefetch" href="/assets/js/93.e06bec76.js"><link rel="prefetch" href="/assets/js/94.b5358aba.js"><link rel="prefetch" href="/assets/js/95.ee20cebc.js"><link rel="prefetch" href="/assets/js/96.b8889bb2.js"><link rel="prefetch" href="/assets/js/97.aefb0279.js"><link rel="prefetch" href="/assets/js/98.72e88659.js"><link rel="prefetch" href="/assets/js/99.fc7fbc75.js">
    <link rel="stylesheet" href="/assets/css/0.styles.46195d5d.css">
  </head>
  <body class="theme-mode-light">
    <div id="app" data-server-rendered="true"><div class="theme-container sidebar-open have-rightmenu"><header class="navbar blur"><div title="目录" class="sidebar-button"><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" viewBox="0 0 448 512" class="icon"><path fill="currentColor" d="M436 124H12c-6.627 0-12-5.373-12-12V80c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12zm0 160H12c-6.627 0-12-5.373-12-12v-32c0-6.627 5.373-12 12-12h424c6.627 0 12 5.373 12 12v32c0 6.627-5.373 12-12 12z"></path></svg></div> <a href="/" class="home-link router-link-active"><img src="/img/EB-logo.png" alt="Vscing blog" class="logo"> <span class="site-name can-hide">Vscing blog</span></a> <div class="links"><div class="search-box"><input aria-label="Search" autocomplete="off" spellcheck="false" value=""> <!----></div> <nav class="nav-links can-hide"><div class="nav-item"><a href="/" class="nav-link">首页</a></div><div class="nav-item"><div class="dropdown-wrapper"><button type="button" aria-label="前端" class="dropdown-title"><a href="/web/" class="link-title">前端</a> <span class="title" style="display:none;">前端</span> <span class="arrow right"></span></button> <ul class="nav-dropdown" style="display:none;"><li class="dropdown-item"><h4>前端文章</h4> <ul class="dropdown-subitem-wrapper"><li class="dropdown-subitem"><a href="/pages/8143cc480faf9a11/" class="nav-link">JavaScript</a></li></ul></li><li class="dropdown-item"><h4>学习笔记</h4> <ul class="dropdown-subitem-wrapper"><li class="dropdown-subitem"><a href="/note/javascript/" class="nav-link">《JavaScript教程》</a></li><li class="dropdown-subitem"><a href="/note/js/" class="nav-link">《JavaScript高级程序设计》</a></li><li class="dropdown-subitem"><a href="/note/es6/" class="nav-link">《ES6 教程》</a></li><li class="dropdown-subitem"><a href="/note/vue/" class="nav-link">《Vue》</a></li><li class="dropdown-subitem"><a href="/note/react/" class="nav-link">《React》</a></li><li class="dropdown-subitem"><a href="/note/typescript-axios/" class="nav-link">《TypeScript 从零实现 axios》</a></li><li class="dropdown-subitem"><a href="/note/git/" class="nav-link">《Git》</a></li><li class="dropdown-subitem"><a href="/pages/51afd6/" class="nav-link">TypeScript</a></li><li class="dropdown-subitem"><a href="/pages/4643cd/" class="nav-link">JS设计模式总结</a></li></ul></li></ul></div></div><div class="nav-item"><div class="dropdown-wrapper"><button type="button" aria-label="页面" class="dropdown-title"><a href="/ui/" class="link-title">页面</a> <span class="title" style="display:none;">页面</span> <span class="arrow right"></span></button> <ul class="nav-dropdown" style="display:none;"><li class="dropdown-item"><!----> <a href="/pages/8309a5b876fc95e3/" class="nav-link">HTML</a></li><li class="dropdown-item"><!----> <a href="/pages/0a83b083bdf257cb/" class="nav-link">CSS</a></li></ul></div></div><div class="nav-item"><div class="dropdown-wrapper"><button type="button" aria-label="技术" class="dropdown-title"><a href="/technology/" class="link-title">技术</a> <span class="title" style="display:none;">技术</span> <span class="arrow right"></span></button> <ul class="nav-dropdown" style="display:none;"><li class="dropdown-item"><!----> <a href="/pages/9a7ee40fc232253e/" class="nav-link">技术文档</a></li><li class="dropdown-item"><!----> <a href="/pages/4c778760be26d8b3/" class="nav-link">GitHub技巧</a></li><li class="dropdown-item"><!----> <a href="/pages/117708e0af7f0bd9/" class="nav-link">Nodejs</a></li><li class="dropdown-item"><!----> <a href="/pages/41f87d890d0a02af/" class="nav-link">博客搭建</a></li></ul></div></div><div class="nav-item"><div class="dropdown-wrapper"><button type="button" aria-label="更多" class="dropdown-title"><a href="/more/" class="link-title">更多</a> <span class="title" style="display:none;">更多</span> <span class="arrow right"></span></button> <ul class="nav-dropdown" style="display:none;"><li class="dropdown-item"><!----> <a href="/pages/f2a556/" class="nav-link">学习</a></li><li class="dropdown-item"><!----> <a href="/pages/aea6571b7a8bae86/" class="nav-link">面试</a></li><li class="dropdown-item"><!----> <a href="/pages/2d615df9a36a98ed/" class="nav-link">心情杂货</a></li><li class="dropdown-item"><!----> <a href="/pages/baaa02/" class="nav-link">实用技巧</a></li><li class="dropdown-item"><!----> <a href="/friends/" class="nav-link">友情链接</a></li></ul></div></div><div class="nav-item"><a href="/about/" class="nav-link">关于</a></div><div class="nav-item"><a href="/pages/beb6c0bd8a66cea6/" class="nav-link">收藏</a></div><div class="nav-item"><div class="dropdown-wrapper"><button type="button" aria-label="索引" class="dropdown-title"><a href="/archives/" class="link-title">索引</a> <span class="title" style="display:none;">索引</span> <span class="arrow right"></span></button> <ul class="nav-dropdown" style="display:none;"><li class="dropdown-item"><!----> <a href="/categories/" class="nav-link">分类</a></li><li class="dropdown-item"><!----> <a href="/tags/" class="nav-link">标签</a></li><li class="dropdown-item"><!----> <a href="/archives/" class="nav-link">归档</a></li></ul></div></div> <a href="https://github.com/xugaoyi/vuepress-theme-vdoing" target="_blank" rel="noopener noreferrer" class="repo-link">
    GitHub
    <span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a></nav></div></header> <div class="sidebar-mask"></div> <aside class="sidebar" style="display:none;"><div class="blogger"><img src="https://cdn.jsdelivr.net/gh/xugaoyi/image_store/blog/20200103123203.jpg"> <div class="blogger-info"><h3>Evan Xu</h3> <span>前端界的小学生</span></div></div> <nav class="nav-links"><div class="nav-item"><a href="/" class="nav-link">首页</a></div><div class="nav-item"><div class="dropdown-wrapper"><button type="button" aria-label="前端" class="dropdown-title"><a href="/web/" class="link-title">前端</a> <span class="title" style="display:none;">前端</span> <span class="arrow right"></span></button> <ul class="nav-dropdown" style="display:none;"><li class="dropdown-item"><h4>前端文章</h4> <ul class="dropdown-subitem-wrapper"><li class="dropdown-subitem"><a href="/pages/8143cc480faf9a11/" class="nav-link">JavaScript</a></li></ul></li><li class="dropdown-item"><h4>学习笔记</h4> <ul class="dropdown-subitem-wrapper"><li class="dropdown-subitem"><a href="/note/javascript/" class="nav-link">《JavaScript教程》</a></li><li class="dropdown-subitem"><a href="/note/js/" class="nav-link">《JavaScript高级程序设计》</a></li><li class="dropdown-subitem"><a href="/note/es6/" class="nav-link">《ES6 教程》</a></li><li class="dropdown-subitem"><a href="/note/vue/" class="nav-link">《Vue》</a></li><li class="dropdown-subitem"><a href="/note/react/" class="nav-link">《React》</a></li><li class="dropdown-subitem"><a href="/note/typescript-axios/" class="nav-link">《TypeScript 从零实现 axios》</a></li><li class="dropdown-subitem"><a href="/note/git/" class="nav-link">《Git》</a></li><li class="dropdown-subitem"><a href="/pages/51afd6/" class="nav-link">TypeScript</a></li><li class="dropdown-subitem"><a href="/pages/4643cd/" class="nav-link">JS设计模式总结</a></li></ul></li></ul></div></div><div class="nav-item"><div class="dropdown-wrapper"><button type="button" aria-label="页面" class="dropdown-title"><a href="/ui/" class="link-title">页面</a> <span class="title" style="display:none;">页面</span> <span class="arrow right"></span></button> <ul class="nav-dropdown" style="display:none;"><li class="dropdown-item"><!----> <a href="/pages/8309a5b876fc95e3/" class="nav-link">HTML</a></li><li class="dropdown-item"><!----> <a href="/pages/0a83b083bdf257cb/" class="nav-link">CSS</a></li></ul></div></div><div class="nav-item"><div class="dropdown-wrapper"><button type="button" aria-label="技术" class="dropdown-title"><a href="/technology/" class="link-title">技术</a> <span class="title" style="display:none;">技术</span> <span class="arrow right"></span></button> <ul class="nav-dropdown" style="display:none;"><li class="dropdown-item"><!----> <a href="/pages/9a7ee40fc232253e/" class="nav-link">技术文档</a></li><li class="dropdown-item"><!----> <a href="/pages/4c778760be26d8b3/" class="nav-link">GitHub技巧</a></li><li class="dropdown-item"><!----> <a href="/pages/117708e0af7f0bd9/" class="nav-link">Nodejs</a></li><li class="dropdown-item"><!----> <a href="/pages/41f87d890d0a02af/" class="nav-link">博客搭建</a></li></ul></div></div><div class="nav-item"><div class="dropdown-wrapper"><button type="button" aria-label="更多" class="dropdown-title"><a href="/more/" class="link-title">更多</a> <span class="title" style="display:none;">更多</span> <span class="arrow right"></span></button> <ul class="nav-dropdown" style="display:none;"><li class="dropdown-item"><!----> <a href="/pages/f2a556/" class="nav-link">学习</a></li><li class="dropdown-item"><!----> <a href="/pages/aea6571b7a8bae86/" class="nav-link">面试</a></li><li class="dropdown-item"><!----> <a href="/pages/2d615df9a36a98ed/" class="nav-link">心情杂货</a></li><li class="dropdown-item"><!----> <a href="/pages/baaa02/" class="nav-link">实用技巧</a></li><li class="dropdown-item"><!----> <a href="/friends/" class="nav-link">友情链接</a></li></ul></div></div><div class="nav-item"><a href="/about/" class="nav-link">关于</a></div><div class="nav-item"><a href="/pages/beb6c0bd8a66cea6/" class="nav-link">收藏</a></div><div class="nav-item"><div class="dropdown-wrapper"><button type="button" aria-label="索引" class="dropdown-title"><a href="/archives/" class="link-title">索引</a> <span class="title" style="display:none;">索引</span> <span class="arrow right"></span></button> <ul class="nav-dropdown" style="display:none;"><li class="dropdown-item"><!----> <a href="/categories/" class="nav-link">分类</a></li><li class="dropdown-item"><!----> <a href="/tags/" class="nav-link">标签</a></li><li class="dropdown-item"><!----> <a href="/archives/" class="nav-link">归档</a></li></ul></div></div> <a href="https://github.com/xugaoyi/vuepress-theme-vdoing" target="_blank" rel="noopener noreferrer" class="repo-link">
    GitHub
    <span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a></nav>  <ul class="sidebar-links"><li><section class="sidebar-group collapsable depth-0"><p class="sidebar-heading"><span>手册</span> <span class="arrow right"></span></p> <!----></section></li><li><section class="sidebar-group collapsable depth-0"><p class="sidebar-heading open"><span>文档笔记</span> <span class="arrow down"></span></p> <ul class="sidebar-links sidebar-group-items"><li><a href="/pages/635088/" class="sidebar-link">Git基础与命令</a></li><li><a href="/pages/4bef1a/" class="sidebar-link">Git分支-分支原理</a></li><li><a href="/pages/ea5a8c/" class="sidebar-link">Git分支的新建与合并-分支操作</a></li><li><a href="/pages/a399b3/" class="sidebar-link">Git分支管理-查看分支</a></li><li><a href="/pages/49ee30/" class="sidebar-link">Git分支开发工作流</a></li><li><a href="/pages/574d62/" class="sidebar-link">Git分支-远程分支</a></li><li><a href="/pages/3a3247/" aria-current="page" class="active sidebar-link">Git分支-变基</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/pages/3a3247/#变基的基本操作" class="sidebar-link">变基的基本操作</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/pages/3a3247/#概念" class="sidebar-link">概念</a></li><li class="sidebar-sub-header"><a href="/pages/3a3247/#原理" class="sidebar-link">原理</a></li><li class="sidebar-sub-header"><a href="/pages/3a3247/#步骤" class="sidebar-link">步骤</a></li><li class="sidebar-sub-header"><a href="/pages/3a3247/#优点" class="sidebar-link">优点</a></li></ul></li><li class="sidebar-sub-header"><a href="/pages/3a3247/#更有趣的变基例子" class="sidebar-link">更有趣的变基例子</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/pages/3a3247/#更有趣的变基例子-2" class="sidebar-link">更有趣的变基例子</a></li><li class="sidebar-sub-header"><a href="/pages/3a3247/#onto选项" class="sidebar-link">--onto选项</a></li><li class="sidebar-sub-header"><a href="/pages/3a3247/#省去先切换到源分支的步骤" class="sidebar-link">省去先切换到源分支的步骤</a></li></ul></li><li class="sidebar-sub-header"><a href="/pages/3a3247/#变基的风险" class="sidebar-link">变基的风险</a><ul class="sidebar-sub-headers"><li class="sidebar-sub-header"><a href="/pages/3a3247/#金科玉律" class="sidebar-link">金科玉律</a></li><li class="sidebar-sub-header"><a href="/pages/3a3247/#变基的实质" class="sidebar-link">变基的实质</a></li></ul></li><li class="sidebar-sub-header"><a href="/pages/3a3247/#用变基解决变基" class="sidebar-link">用变基解决变基</a></li><li class="sidebar-sub-header"><a href="/pages/3a3247/#变基-vs-合并" class="sidebar-link">变基 vs. 合并</a></li></ul></li><li><a href="/pages/c984d1/" class="sidebar-link">Git工具-查看修订版本</a></li><li><a href="/pages/76d859/" class="sidebar-link">Git工具-交互式暂存</a></li><li><a href="/pages/1832fe/" class="sidebar-link">Git工具-重写历史</a></li><li><a href="/pages/d9e9c6/" class="sidebar-link">Git工具-重置揭密</a></li></ul></section></li></ul> <div class="sidebar-slot sidebar-slot-bottom"><!-- 正方形 -->
      <ins class="adsbygoogle"
          style="display:block"
          data-ad-client="ca-pub-7828333725993554"
          data-ad-slot="3508773082"
          data-ad-format="auto"
          data-full-width-responsive="true"></ins>
      <script>
          (adsbygoogle = window.adsbygoogle || []).push({});
      </script></div></aside> <div><main class="page"><div class="theme-vdoing-wrapper "><div class="articleInfo-wrap" data-v-1cd794fe><div class="articleInfo" data-v-1cd794fe><ul class="breadcrumbs" data-v-1cd794fe><li data-v-1cd794fe><a href="/" title="首页" class="iconfont icon-home router-link-active" data-v-1cd794fe></a></li> <li data-v-1cd794fe><a href="/note/git" title="《Git》学习笔记-目录页" data-v-1cd794fe>《Git》学习笔记</a></li> <li data-v-1cd794fe><a href="/note/git/#文档笔记" title="《Git》学习笔记#文档笔记" data-v-1cd794fe>文档笔记</a></li> <!----></ul> <div class="info" data-v-1cd794fe><div title="作者" class="author iconfont icon-touxiang" data-v-1cd794fe><a href="https://github.com/xugaoyi" target="_blank" title="作者" class="beLink" data-v-1cd794fe>xugaoyi</a></div> <div title="创建时间" class="date iconfont icon-riqi" data-v-1cd794fe><a href="javascript:;" data-v-1cd794fe>2020-11-18</a></div> <!----></div></div></div> <!----> <div class="content-wrapper"><div class="right-menu-wrapper"><div class="right-menu-margin"><div class="right-menu-content"></div></div></div> <h1><img src="">
          Git分支-变基
        </h1> <div class="page-slot page-slot-top"><!-- 固定100% * 90px可显示，max-height:90px未见显示-->
     <ins class="adsbygoogle"
          style="display:inline-block;width:100%;max-height:90px"
          data-ad-client="ca-pub-7828333725993554"
          data-ad-slot="6625304284"></ins>
      <script>
          (adsbygoogle = window.adsbygoogle || []).push({});
      </script></div> <div class="theme-vdoing-content content__default"><h1 id="git分支-变基"><a href="#git分支-变基" class="header-anchor">#</a> Git分支-变基</h1> <p>在 Git 中整合来自不同分支的修改主要有两种方法：<code>merge</code> 以及 <code>rebase</code>。 在本节中我们将学习什么是“变基”，怎样使用“变基”，并将展示该操作的惊艳之处，以及指出在何种情况下你应避免使用它。</p> <h2 id="变基的基本操作"><a href="#变基的基本操作" class="header-anchor">#</a> 变基的基本操作</h2> <p>请回顾之前在 <a href="https://git-scm.com/book/zh/v2/ch00/_basic_merging" target="_blank" rel="noopener noreferrer">分支的合并<span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a> 中的一个例子，你会看到开发任务分叉到两个不同分支，又各自提交了更新。</p> <p><img src="https://git-scm.com/book/en/v2/images/basic-rebase-1.png" alt="分叉的提交历史。"></p> <p align="center">图0.   分叉的提交历史 ▲</p> <p>之前介绍过，整合分支最容易的方法是 <code>merge</code> 命令。 它会把两个分支的最新快照（<code>C3</code> 和 <code>C4</code>）以及二者最近的共同祖先（<code>C2</code>）进行<strong>三方合并</strong>，合并的结果是生成一个新的快照（并提交）。</p> <p><img src="https://git-scm.com/book/en/v2/images/basic-rebase-2.png" alt="通过合并操作来整合分叉了的历史。"></p> <p align="center">图1.   通过合并操作来整合分叉的历史 ▲</p> <h3 id="概念"><a href="#概念" class="header-anchor">#</a> 概念</h3> <p><strong>变基就是：将某一分支上的所有修改复制到另一分支上</strong></p> <p>除了<code>merge</code>，还有一种方法：你可以提取在 <code>C4</code> 中引入的补丁和修改，然后在 <code>C3</code> 的基础上应用一次。 在 Git 中，这种操作就叫做 <strong>变基（rebase）</strong>。 你可以使用 <code>rebase</code> 命令将提交到某一分支上的所有修改都移到另一分支上，就好像“重新播放”一样。</p> <p>在这个例子中，你可以检出 <code>experiment</code> 分支，然后将它变基到 <code>master</code> 分支上：</p> <div class="language-sh line-numbers-mode"><pre class="language-sh"><code>$ <span class="token function">git</span> checkout experiment
$ <span class="token function">git</span> rebase master <span class="token comment"># 将experiment上的修改变基到master分支上（将experiment的提交移动到master上。）</span>
First, rewinding <span class="token function">head</span> to replay your work on <span class="token function">top</span> of it<span class="token punctuation">..</span>.
Applying: added staged <span class="token builtin class-name">command</span>
</code></pre> <div class="line-numbers-wrapper"><span class="line-number">1</span><br><span class="line-number">2</span><br><span class="line-number">3</span><br><span class="line-number">4</span><br></div></div><p>它的原理是首先找到这两个分支（即当前分支 <code>experiment</code>、变基操作的目标基底分支 <code>master</code>） 的最近共同祖先 <code>C2</code>，然后对比当前分支相对于该祖先的历次提交，提取相应的修改并存为临时文件， 然后将当前分支指向目标基底 <code>C3</code>, 最后以此将之前另存为临时文件的修改依序应用。 （译注：写明了 commit id，以便理解，下同）</p> <h3 id="原理"><a href="#原理" class="header-anchor">#</a> 原理</h3> <ol><li><p><strong>找到当前分支和目标分支的最近共同祖先</strong></p></li> <li><p><strong>对比当前分支相对于该共同祖先的历次提交</strong></p></li> <li><p><strong>提取相应的修改并存为临时文件</strong></p></li> <li><p><strong>将当前分支指向目标分支</strong></p></li> <li><p><strong>将之前临时文件的修改依序应用</strong></p></li></ol> <p><img src="https://git-scm.com/book/en/v2/images/basic-rebase-3.png" alt="将  中的修改变基到  上。"></p> <p align="center">图2.将 C4 中的修改变基到 C3 上 ▲</p> <p>现在回到 <code>master</code> 分支，进行一次快进合并。</p> <div class="language-sh line-numbers-mode"><pre class="language-sh"><code>$ <span class="token function">git</span> checkout master
$ <span class="token function">git</span> merge experiment
</code></pre> <div class="line-numbers-wrapper"><span class="line-number">1</span><br><span class="line-number">2</span><br></div></div><p><img src="https://git-scm.com/book/en/v2/images/basic-rebase-4.png" alt=" 分支的快进合并。"></p> <p align="center">图3.master 分支的快进合并 ▲</p> <h3 id="步骤"><a href="#步骤" class="header-anchor">#</a> 步骤</h3> <p><strong>先检出源分支，将源分支的修改变基到目标分支。切回目标分支，进行一次快进合并</strong></p> <div class="language-sh line-numbers-mode"><pre class="language-sh"><code><span class="token comment"># 示意：</span>
<span class="token function">git</span> checkout <span class="token operator">&lt;</span>源分支<span class="token operator">&gt;</span>
<span class="token function">git</span> <span class="token punctuation">(</span>源分支的修改<span class="token punctuation">)</span>rebase<span class="token punctuation">(</span>到<span class="token punctuation">)</span> <span class="token operator">&lt;</span>目标分支<span class="token operator">&gt;</span>
<span class="token function">git</span> checkout <span class="token operator">&lt;</span>目标分支<span class="token operator">&gt;</span>
<span class="token function">git</span> merge <span class="token operator">&lt;</span>源分支<span class="token operator">&gt;</span>
</code></pre> <div class="line-numbers-wrapper"><span class="line-number">1</span><br><span class="line-number">2</span><br><span class="line-number">3</span><br><span class="line-number">4</span><br><span class="line-number">5</span><br></div></div><p>此时，<code>C4'</code> 指向的快照就和 <a href="https://git-scm.com/book/zh/v2/ch00/ebasing-merging-example" target="_blank" rel="noopener noreferrer">the merge example<span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a> 中 <code>C5</code> 指向的快照一模一样了。 这两种整合方法的最终结果没有任何区别，但是 <strong>变基使得提交历史更加整洁</strong>。 你在查看一个经过变基的分支的历史记录时会发现，尽管实际的开发工作是并行的， 但它们看上去就像是串行的一样，提交历史是一条直线没有分叉。</p> <p>一般我们这样做的目的是为了确保在向远程分支推送时能保持提交历史的整洁——<strong>例如向某个其他人维护的项目贡献代码时。 在这种情况下，你首先在自己的分支里进行开发，当开发完成时你需要先将你的代码变基到 <code>origin/master</code> 上，然后再向主项目提交修改</strong>。 这样的话，该项目的维护者就不再需要进行整合工作，只需要快进合并便可。</p> <p>请注意，无论是通过变基，还是通过三方合并，整合的最终结果所指向的快照始终是一样的，只不过提交历史不同罢了。 变基是将一系列提交按照原有次序依次应用到另一分支上，而合并是把最终结果合在一起。</p> <h3 id="优点"><a href="#优点" class="header-anchor">#</a> 优点</h3> <p><strong>变基的优点： 使提交记录更加整洁。</strong></p> <h2 id="更有趣的变基例子"><a href="#更有趣的变基例子" class="header-anchor">#</a> 更有趣的变基例子</h2> <p>在对两个分支进行变基时，所生成的“重放”并不一定要在目标分支上应用，你也可以指定另外的一个分支进行应用。 就像 <a href="https://git-scm.com/book/zh/v2/ch00/bdiag_e" target="_blank" rel="noopener noreferrer">从一个主题分支里再分出一个主题分支的提交历史<span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a> 中的例子那样。 你创建了一个主题分支 <code>server</code>，为服务端添加了一些功能，提交了 <code>C3</code> 和 <code>C4</code>。 然后从 <code>C3</code> 上创建了主题分支 <code>client</code>，为客户端添加了一些功能，提交了 <code>C8</code> 和 <code>C9</code>。 最后，你回到 <code>server</code> 分支，又提交了 <code>C10</code>。</p> <h3 id="更有趣的变基例子-2"><a href="#更有趣的变基例子-2" class="header-anchor">#</a> 更有趣的变基例子</h3> <p>在对两个分支进行变基时，所生成的“重放”并不一定要在目标分支上应用，你也可以指定另外的一个分支进行应用。 就像 <a href="https://git-scm.com/book/zh/v2/ch00/bdiag_e" target="_blank" rel="noopener noreferrer">从一个主题分支里再分出一个主题分支的提交历史<span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a> 中的例子那样。 你创建了一个主题分支 <code>server</code>，为服务端添加了一些功能，提交了 <code>C3</code> 和 <code>C4</code>。 然后从 <code>C3</code> 上创建了主题分支 <code>client</code>，为客户端添加了一些功能，提交了 <code>C8</code> 和 <code>C9</code>。 最后，你回到 <code>server</code> 分支，又提交了 <code>C10</code>。</p> <p><img src="https://git-scm.com/book/en/v2/images/interesting-rebase-1.png" alt="从一个主题分支里再分出一个主题分支的提交历史。"></p> <p align="center">图4.从一个主题分支里再分出一个主题分支的提交历史 ▲</p> <p>假设你希望将 <code>client</code> 中的修改合并到主分支并发布，但暂时并不想合并 <code>server</code> 中的修改， 因为它们还需要经过更全面的测试。这时，你就可以使用 <code>git rebase</code> 命令的 <strong><code>--onto</code> 选项， 选中在 <code>client</code> 分支里但不在 <code>server</code> 分支里的修改（即 <code>C8</code> 和 <code>C9</code>），将它们在 <code>master</code> 分支上重放</strong>：</p> <div class="language-sh line-numbers-mode"><pre class="language-sh"><code>$ <span class="token function">git</span> rebase --onto master server client
</code></pre> <div class="line-numbers-wrapper"><span class="line-number">1</span><br></div></div><p>以上命令的意思是：“取出 <code>client</code> 分支，找出它从 <code>server</code> 分支分歧之后的补丁， 然后把这些补丁在 <code>master</code> 分支上重放一遍，让 <code>client</code> 看起来像直接基于 <code>master</code> 修改一样”。这理解起来有一点复杂，不过效果非常酷。</p> <h3 id="onto选项"><a href="#onto选项" class="header-anchor">#</a> --onto选项</h3> <p><strong>选中C分支中的但不在B分支里的修改，应用到A分支。</strong></p> <p><img src="https://git-scm.com/book/en/v2/images/interesting-rebase-2.png" alt="截取主题分支上的另一个主题分支，然后变基到其他分支。"></p> <p align="center">图5.截取主题分支上的另一个主题分支，然后变基到其他分支 ▲</p> <p>现在可以快进合并 <code>master</code> 分支了。（如图 <a href="https://git-scm.com/book/zh/v2/ch00/bdiag_g" target="_blank" rel="noopener noreferrer">快进合并 <code>master</code> 分支，使之包含来自 <code>client</code> 分支的修改<span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a>）：</p> <div class="language-sh line-numbers-mode"><pre class="language-sh"><code>$ <span class="token function">git</span> checkout master
$ <span class="token function">git</span> merge client
</code></pre> <div class="line-numbers-wrapper"><span class="line-number">1</span><br><span class="line-number">2</span><br></div></div><p><img src="https://git-scm.com/book/en/v2/images/interesting-rebase-3.png" alt="快进合并  分支，使之包含来自  分支的修改。"></p> <p align="center">图6.快进合并 `master` 分支，使之包含来自 `client` 分支的修改 ▲</p> <h3 id="省去先切换到源分支的步骤"><a href="#省去先切换到源分支的步骤" class="header-anchor">#</a> 省去先切换到源分支的步骤</h3> <div class="language-sh line-numbers-mode"><pre class="language-sh"><code><span class="token function">git</span> rebase <span class="token operator">&lt;</span>目标<span class="token punctuation">(</span>当前<span class="token punctuation">)</span>分支<span class="token operator">&gt;</span> <span class="token operator">&lt;</span>源分支<span class="token operator">&gt;</span> <span class="token comment"># 将源分支变基到目标分支。执行此命令后会自动切换到源分支</span>
<span class="token function">git</span> checkout <span class="token operator">&lt;</span>目标分支<span class="token operator">&gt;</span>
<span class="token function">git</span> merge <span class="token operator">&lt;</span>源分支<span class="token operator">&gt;</span>
</code></pre> <div class="line-numbers-wrapper"><span class="line-number">1</span><br><span class="line-number">2</span><br><span class="line-number">3</span><br></div></div><p><strong>注意：使用这个方法要确保源分支上的代码是最新的。</strong></p> <p>接下来你决定将 <code>server</code> 分支中的修改也整合进来。 使用 <code>git rebase &lt;basebranch&gt; &lt;topicbranch&gt;</code> 命令可以直接将主题分支 （即本例中的 <code>server</code>）变基到目标分支（即 <code>master</code>）上。 这样做能省去你先切换到 <code>server</code> 分支，再对其执行变基命令的多个步骤。</p> <div class="language-sh line-numbers-mode"><pre class="language-sh"><code>$ <span class="token function">git</span> rebase master server
</code></pre> <div class="line-numbers-wrapper"><span class="line-number">1</span><br></div></div><p>如图 <a href="https://git-scm.com/book/zh/v2/ch00/bdiag_h" target="_blank" rel="noopener noreferrer">将 <code>server</code> 中的修改变基到 <code>master</code> 上<span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a> 所示，<code>server</code> 中的代码被“续”到了 <code>master</code> 后面。</p> <p><img src="https://git-scm.com/book/en/v2/images/interesting-rebase-4.png" alt="将  中的修改变基到  上。"></p> <p align="center">图7.将 `server` 中的修改变基到 `master` 上 ▲</p> <p>然后就可以快进合并主分支 <code>master</code> 了：</p> <div class="language-sh line-numbers-mode"><pre class="language-sh"><code>$ <span class="token function">git</span> checkout master
$ <span class="token function">git</span> merge server
</code></pre> <div class="line-numbers-wrapper"><span class="line-number">1</span><br><span class="line-number">2</span><br></div></div><p>至此，<code>client</code> 和 <code>server</code> 分支中的修改都已经整合到主分支里了， 你可以删除这两个分支，最终提交历史会变成图 <a href="https://git-scm.com/book/zh/v2/ch00/bdiag_i" target="_blank" rel="noopener noreferrer">最终的提交历史<span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a> 中的样子：</p> <div class="language-sh line-numbers-mode"><pre class="language-sh"><code>$ <span class="token function">git</span> branch -d client
$ <span class="token function">git</span> branch -d server
</code></pre> <div class="line-numbers-wrapper"><span class="line-number">1</span><br><span class="line-number">2</span><br></div></div><p><img src="https://git-scm.com/book/en/v2/images/interesting-rebase-5.png" alt="最终的提交历史。"></p> <p align="center">图8. 最终的提交历史 ▲</p> <h2 id="变基的风险"><a href="#变基的风险" class="header-anchor">#</a> 变基的风险</h2> <h3 id="金科玉律"><a href="#金科玉律" class="header-anchor">#</a> 金科玉律</h3> <p>呃，奇妙的变基也并非完美无缺，要用它得遵守一条准则：</p> <p><strong>如果提交存在于你的仓库之外，而别人可能基于这些提交进行开发，那么不要执行变基。</strong></p> <p>如果你遵循这条金科玉律，就不会出差错。 否则，人民群众会仇恨你，你的朋友和家人也会嘲笑你，唾弃你。</p> <div class="custom-block tip"><p class="custom-block-title">提示</p> <p><strong>例如：几个人同时在一个主题分支上进行开发和提交时，你不要中途执行变基，只有在大家都完成工作之后才可以执行变基。</strong></p></div> <h3 id="变基的实质"><a href="#变基的实质" class="header-anchor">#</a> 变基的实质</h3> <p><strong>变基操作的实质是丢弃一些现有的提交，然后相应地新建一些内容一样但实际上不同的提交。</strong> 如果你已经将提交推送至某个仓库，而其他人也已经从该仓库拉取提交并进行了后续工作，此时，如果你用 <code>git rebase</code> 命令重新整理了提交并再次推送，你的同伴因此将不得不再次将他们手头的工作与你的提交进行整合，如果接下来你还要拉取并整合他们修改过的提交，事情就会变得一团糟。</p> <p>让我们来看一个在公开的仓库上执行变基操作所带来的问题。 假设你从一个中央服务器克隆然后在它的基础上进行了一些开发。 你的提交历史如图所示：</p> <p><img src="https://git-scm.com/book/en/v2/images/perils-of-rebasing-1.png" alt="克隆一个仓库，然后在它的基础上进行了一些开发。"></p> <p align="center">图9. 克隆一个仓库，然后在它的基础上进行了一些开发 ▲</p> <p>然后，某人又向中央服务器提交了一些修改，其中还包括一次合并。 你抓取了这些在远程分支上的修改，并将其合并到你本地的开发分支，然后你的提交历史就会变成这样：</p> <p><img src="https://git-scm.com/book/en/v2/images/perils-of-rebasing-2.png" alt="抓取别人的提交，合并到自己的开发分支。"></p> <p align="center">图10. 抓取别人的提交，合并到自己的开发分支 ▲</p> <p>接下来，这个人又决定把合并操作回滚，改用变基；继而又用 <code>git push --force</code> 命令覆盖了服务器上的提交历史。 之后你从服务器抓取更新，会发现多出来一些新的提交。</p> <p><img src="https://git-scm.com/book/en/v2/images/perils-of-rebasing-3.png" alt="有人推送了经过变基的提交，并丢弃了你的本地开发所基于的一些提交。"></p> <p align="center">图11. 有人推送了经过变基的提交，并丢弃了你的本地开发所基于的一些提交 ▲</p> <p>结果就是你们两人的处境都十分尴尬。 如果你执行 <code>git pull</code> 命令，你将合并来自两条提交历史的内容，生成一个新的合并提交，最终仓库会如图所示：</p> <p><img src="https://git-scm.com/book/en/v2/images/perils-of-rebasing-4.png" alt="你将相同的内容又合并了一次，生成了一个新的提交。"></p> <p align="center">图12. 你将相同的内容又合并了一次，生成了一个新的提交 ▲</p> <p>此时如果你执行 <code>git log</code> 命令，你会发现有两个提交的作者、日期、日志居然是一样的，这会令人感到混乱。 此外，如果你将这一堆又推送到服务器上，你实际上是将那些已经被变基抛弃的提交又找了回来，这会令人感到更加混乱。 很明显对方并不想在提交历史中看到 <code>C4</code> 和 <code>C6</code>，因为之前就是他把这两个提交通过变基丢弃的。</p> <h2 id="用变基解决变基"><a href="#用变基解决变基" class="header-anchor">#</a> 用变基解决变基</h2> <p>如果你 <strong>真的</strong> 遭遇了类似的处境，Git 还有一些高级魔法可以帮到你。 如果团队中的某人强制推送并覆盖了一些你所基于的提交，你需要做的就是检查你做了哪些修改，以及他们覆盖了哪些修改。</p> <p>实际上，Git 除了对整个提交计算 SHA-1 校验和以外，也对本次提交所引入的修改计算了校验和——即 “patch-id”。</p> <p>如果你拉取被覆盖过的更新并将你手头的工作基于此进行变基的话，一般情况下 Git 都能成功分辨出哪些是你的修改，并把它们应用到新分支上。</p> <p>举个例子，如果遇到前面提到的 <a href="https://git-scm.com/book/zh/v2/ch00/_pre_merge_rebase_work" target="_blank" rel="noopener noreferrer">有人推送了经过变基的提交，并丢弃了你的本地开发所基于的一些提交<span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a> 那种情境，如果我们不是执行合并，而是执行 <code>git rebase teamone/master</code>, Git 将会：</p> <ul><li>检查哪些提交是我们的分支上独有的（C2，C3，C4，C6，C7）</li> <li>检查其中哪些提交不是合并操作的结果（C2，C3，C4）</li> <li>检查哪些提交在对方覆盖更新时并没有被纳入目标分支（只有 C2 和 C3，因为 C4 其实就是 C4'）</li> <li>把查到的这些提交应用在 <code>teamone/master</code> 上面</li></ul> <p>从而我们将得到与 <a href="https://git-scm.com/book/zh/v2/ch00/_merge_rebase_work" target="_blank" rel="noopener noreferrer">你将相同的内容又合并了一次，生成了一个新的提交<span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a> 中不同的结果，如图 <a href="https://git-scm.com/book/zh/v2/ch00/_rebase_rebase_work" target="_blank" rel="noopener noreferrer">在一个被变基然后强制推送的分支上再次执行变基<span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></a> 所示。</p> <p><img src="https://git-scm.com/book/en/v2/images/perils-of-rebasing-5.png" alt="在一个被变基然后强制推送的分支上再次执行变基。"></p> <p align="center">图13. 在一个被变基然后强制推送的分支上再次执行变基 ▲</p> <p>要想上述方案有效，还需要对方在变基时确保 <code>C4'</code> 和 <code>C4</code> 是几乎一样的。 否则变基操作将无法识别，并新建另一个类似 <code>C4</code> 的补丁（而这个补丁很可能无法整洁的整合入历史，因为补丁中的修改已经存在于某个地方了）。</p> <p>在本例中另一种简单的方法是使用 <code>git pull --rebase</code> 命令而不是直接 <code>git pull</code>。 又或者你可以自己手动完成这个过程，先 <code>git fetch</code>，再 <code>git rebase teamone/master</code>。</p> <p>如果你习惯使用 <code>git pull</code> ，同时又希望默认使用选项 <code>--rebase</code>，你可以执行这条语句 <code>git config --global pull.rebase true</code> 来更改 <code>pull.rebase</code> 的默认配置。</p> <p>如果你只对不会离开你电脑的提交执行变基，那就不会有事。 如果你对已经推送过的提交执行变基，但别人没有基于它的提交，那么也不会有事。 如果你对已经推送至共用仓库的提交上执行变基命令，并因此丢失了一些别人的开发所基于的提交， 那你就有大麻烦了，你的同事也会因此鄙视你。</p> <p>如果你或你的同事在某些情形下决意要这么做，请一定要通知每个人执行 <code>git pull --rebase</code> 命令，这样尽管不能避免伤痛，但能有所缓解。</p> <h2 id="变基-vs-合并"><a href="#变基-vs-合并" class="header-anchor">#</a> 变基 vs. 合并</h2> <p>至此，你已在实战中学习了变基和合并的用法，你一定会想问，到底哪种方式更好。 在回答这个问题之前，让我们退后一步，想讨论一下提交历史到底意味着什么。</p> <p>有一种观点认为，仓库的提交历史即是 <strong>记录实际发生过什么</strong>。 它是针对历史的文档，本身就有价值，不能乱改。 从这个角度看来，改变提交历史是一种亵渎，你使用 <em>谎言</em> 掩盖了实际发生过的事情。 如果由合并产生的提交历史是一团糟怎么办？ 既然事实就是如此，那么这些痕迹就应该被保留下来，让后人能够查阅。</p> <p>另一种观点则正好相反，他们认为提交历史是 <strong>项目过程中发生的事</strong>。 没人会出版一本书的第一版草稿，软件维护手册也是需要反复修订才能方便使用。 持这一观点的人会使用 <code>rebase</code> 及 <code>filter-branch</code> 等工具来编写故事，怎么方便后来的读者就怎么写。</p> <p>现在，让我们回到之前的问题上来，到底合并还是变基好？希望你能明白，这并没有一个简单的答案。 Git 是一个非常强大的工具，它允许你对提交历史做许多事情，但每个团队、每个项目对此的需求并不相同。 既然你已经分别学习了两者的用法，相信你能够根据实际情况作出明智的选择。</p> <p><strong>总的原则是，只对尚未推送或分享给别人的本地修改执行变基操作清理历史， 从不对已推送至别处的提交执行变基操作，这样，你才能享受到两种方式带来的便利。</strong></p></div></div> <div class="page-slot page-slot-bottom"><!-- 横向自适应 -->
      <ins class="adsbygoogle"
          style="display:block"
          data-ad-client="ca-pub-7828333725993554"
          data-ad-slot="6620245489"
          data-ad-format="auto"
          data-full-width-responsive="true"></ins>
      <script>
          (adsbygoogle = window.adsbygoogle || []).push({});
      </script></div> <div class="page-edit"><div class="edit-link"><a href="https://github.com/xugaoyi/vuepress-theme-vdoing/edit/master/docs/《Git》学习笔记/20.文档笔记/70.Git分支-变基.md" target="_blank" rel="noopener noreferrer">编辑</a> <span><svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound"><path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path> <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon></svg> <span class="sr-only">(opens new window)</span></span></div> <div class="tags"><a href="/tags/?tag=Git" title="标签">#Git</a></div> <!----></div> <div class="page-nav-wapper"><div class="page-nav-centre-wrap"><a href="/pages/574d62/" class="page-nav-centre page-nav-centre-prev"><div class="tooltip">Git分支-远程分支</div></a> <a href="/pages/c984d1/" class="page-nav-centre page-nav-centre-next"><div class="tooltip">Git工具-查看修订版本</div></a></div> <div class="page-nav"><p class="inner"><span class="prev">
        ←
        <a href="/pages/574d62/" class="prev">Git分支-远程分支</a></span> <span class="next"><a href="/pages/c984d1/">Git工具-查看修订版本</a>→
      </span></p></div></div></div> <div class="article-list"><div class="article-title"><a href="/archives/" class="iconfont icon-bi">最近更新</a></div> <div class="article-wrapper"><dl><dd>01</dd> <dt><a href="/pages/dcebaf/"><div>一行代码“黑”掉任意网站</div></a> <span>11-25</span></dt></dl><dl><dd>02</dd> <dt><a href="/pages/a61298/"><div>33个非常实用的JavaScript一行代码</div></a> <span>11-02</span></dt></dl><dl><dd>03</dd> <dt><a href="/pages/82baa3/"><div>使用State Hook</div></a> <span>04-06</span></dt></dl> <dl><dd></dd> <dt><a href="/archives/" class="more">更多文章&gt;</a></dt></dl></div></div></main></div> <div class="footer"><div class="icons"><a href="mailto:894072666@qq.com" title="发邮件" target="_blank" class="iconfont icon-youjian"></a><a href="https://github.com/xugaoyi" title="GitHub" target="_blank" class="iconfont icon-github"></a><a href="https://music.163.com/#/playlist?id=755597173" title="听音乐" target="_blank" class="iconfont icon-erji"></a></div> 
  Theme by
  <a href="https://github.com/xugaoyi/vuepress-theme-vdoing" target="_blank" title="本站主题">Vdoing</a> 
    | Copyright © 2019-2021
    <span>Evan Xu | <a href="https://github.com/xugaoyi/vuepress-theme-vdoing/blob/master/LICENSE" target="_blank">MIT License</a></span></div> <div class="buttons"><div title="返回顶部" class="button blur go-to-top iconfont icon-fanhuidingbu" style="display:none;"></div> <div title="去评论" class="button blur go-to-comment iconfont icon-pinglun" style="display:none;"></div> <div title="主题模式" class="button blur theme-mode-but iconfont icon-zhuti"><ul class="select-box" style="display:none;"><li class="iconfont icon-zidong">
          跟随系统
        </li><li class="iconfont icon-rijianmoshi">
          浅色模式
        </li><li class="iconfont icon-yejianmoshi">
          深色模式
        </li><li class="iconfont icon-yuedu">
          阅读模式
        </li></ul></div></div> <!----> <!----> <div class="custom-html-window custom-html-window-rb" style="display:;"><div class="custom-wrapper"><i class="close-but">×</i> <div><!-- 固定160*160px -->
      <ins class="adsbygoogle"
          style="display:inline-block;max-width:160px;max-height:160px"
          data-ad-client="ca-pub-7828333725993554"
          data-ad-slot="8377369658"></ins>
      <script>
          (adsbygoogle = window.adsbygoogle || []).push({});
      </script>
      </div></div></div></div><div class="global-ui"><div></div></div></div>
    <script src="/assets/js/app.c1850502.js" defer></script><script src="/assets/js/2.d72a94c1.js" defer></script><script src="/assets/js/129.bd944054.js" defer></script>
  </body>
</html>